From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 16 Jul 2010 15:45:58 +0000 (-0400)
Subject: Merge changes from emacs-23 branch.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7213
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fac02871f59445713fef074c6a72497c9ddcebb1;p=emacs.git

Merge changes from emacs-23 branch.
---

fac02871f59445713fef074c6a72497c9ddcebb1